[IA64] Remove compilation warning and typo caused by 19268:4b7d638a8b89

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

diff --git a/xen/common/xencomm.c b/xen/common/xencomm.c
index 0bf00a78262fa570c2f90232b75427296f72c577..247545494d3c0036c9c1b4fa4479b00d3073804a 100644 (file)
--- a/xen/common/xencomm.c
+++ b/xen/common/xencomm.c
@@ -51,7 +51,7 @@ xencomm_get_page(unsigned long paddr, struct page_info **page)
         return -EFAULT;
         
     *page = maddr_to_page(maddr);
-    if ( !get_page(*page, current->domain) == 0 )
+    if ( !get_page(*page, current->domain) )
     {
         /*
          * This page might be a page granted by another domain, or this page 

diff --git a/xen/include/asm-ia64/mm.h b/xen/include/asm-ia64/mm.h
index 9cadc21ba4bca8b004ec070a583f75e95601a356..ec0af88389aac236f0afb5af2279d2d40bc98285 100644 (file)
--- a/xen/include/asm-ia64/mm.h
+++ b/xen/include/asm-ia64/mm.h
@@ -200,7 +200,8 @@ static inline void put_page(struct page_info *page)
         free_domheap_page(page);
 }
 
-static inline page_get_owner_and_reference(struct page_info *page)
+static inline struct domain *page_get_owner_and_reference(
+    struct page_info *page)
 {
     unsigned long x, y = page->count_info;
 
@@ -226,7 +227,7 @@ static inline int get_page(struct page_info *page,
         return 1;
 
     put_page(page);
-fail:
+
     /* if (!domain->is_dying) */ /* XXX: header inclusion hell */
     gdprintk(XENLOG_INFO,
              "Error pfn %lx: rd=%p, od=%p, caf=%016lx, taf=%" PRtype_info "\n",